From cf237cb85bb929f25631c1687c15eef5bf87e8ad Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 7 May 2016 17:55:57 +0200 Subject: [PATCH] patches: fix some embedding quirks --- debian/patches/deps-adjust-versions.patch | 50 +++++++++++++++++++++++ debian/patches/series | 2 + 2 files changed, 52 insertions(+) create mode 100644 debian/patches/deps-adjust-versions.patch diff --git a/debian/patches/deps-adjust-versions.patch b/debian/patches/deps-adjust-versions.patch new file mode 100644 index 000000000..e94f260a2 --- /dev/null +++ b/debian/patches/deps-adjust-versions.patch @@ -0,0 +1,50 @@ +From: Luca Bruno +Description: Adjust deps dependencies + This is a workaround for bugs in the embedding script +Forwarded: not-needed +--- a/deps/semver-0.2.2/Cargo.toml ++++ b/deps/semver-0.2.2/Cargo.toml +@@ -12,7 +12,7 @@ + """ + + [dependencies] +-nom = "1.0.1" ++nom = "1.2.0" + + [features] + default = [] +--- a/deps/flate2-0.2.13/Cargo.toml ++++ b/deps/flate2-0.2.13/Cargo.toml +@@ -17,12 +17,12 @@ + + [dependencies] + libc = "0.2" +-miniz-sys = { path = "miniz-sys", version = "0.1.7", optional = true } ++miniz-sys = { path = "miniz-sys", version = "0.1.7" } + libz-sys = { version = "1.0", optional = true } + + [dev-dependencies] + rand = "0.3" + + [features] +-default = ["miniz-sys"] ++default = [] + zlib = ["libz-sys"] +--- a/deps/log-0.3.5/Cargo.toml ++++ b/deps/log-0.3.5/Cargo.toml +@@ -17,7 +17,7 @@ + harness = false + + [dependencies] +-libc = {version = "0.2", optional = true} ++libc = {version = "0.2" } + + [features] + max_level_off = [] +@@ -35,5 +35,5 @@ + release_max_level_trace = [] + + nightly = [] +-use_std = ["libc"] ++use_std = [] + default = ["use_std"] diff --git a/debian/patches/series b/debian/patches/series index f72ad9fa8..4acccca4a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,6 @@ clean-cargo-deps.patch +deps-adjust-versions.patch +deps-url-fix-toml.patch libgit2-fixes.patch clean-win-crates.patch local-jquery.patch -- 2.30.2